Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include encoding in signature payload (#30174) #30181

Merged
merged 4 commits into from
Apr 1, 2024
Merged

Include encoding in signature payload (#30174) #30181

merged 4 commits into from
Apr 1, 2024

Conversation

GiteaBot
Copy link
Contributor

Backport #30174 by @KN4CK3R

Fixes #30119

Include the encoding in the signature payload.

before
grafik

after
grafik

@GiteaBot GiteaBot added modifies/go Pull requests that update Go code type/bug labels Mar 29, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 29, 2024
@GiteaBot GiteaBot added this to the 1.21.11 milestone Mar 29, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 29, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 29, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 29, 2024
@silverwind silverwind added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 29, 2024
@silverwind
Copy link
Member

@KN4CK3R lint failing:

Error: modules/git/commit_test.go:152:10: undefined: Sha1Hash (typecheck)

KN4CK3R
KN4CK3R reviewed Mar 30, 2024
View reviewed changes
modules/git/commit_test.go Outdated Show resolved Hide resolved
KN4CK3R
KN4CK3R reviewed Mar 30, 2024
View reviewed changes
modules/git/commit_test.go Outdated Show resolved Hide resolved
KN4CK3R
KN4CK3R reviewed Mar 30, 2024
View reviewed changes
modules/git/commit_test.go Outdated Show resolved Hide resolved
@KN4CK3R KN4CK3R enabled auto-merge (squash) March 30, 2024 10:31
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 30, 2024
@silverwind
Copy link
Member

silverwind commented Mar 30, 2024 •
edited
Loading

@lunny v1.21 branch still has mysql5 and mysql8. Can this be changed per-branch?

@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 30, 2024
@lunny
Copy link
Member

lunny commented Mar 31, 2024

@lunny v1.21 branch still has mysql5 and mysql8. Can this be changed per-branch?

This PR is unrelated to database charset. It's about git signature's text encoding. So I don't know what did you mean.

@KN4CK3R
Copy link
Member

KN4CK3R commented Mar 31, 2024 via email

@silverwind
Copy link
Member

@lunny v1.21 branch still has mysql5 and mysql8. Can this be changed per-branch?

This PR is unrelated to database charset. It's about git signature's text encoding. So I don't know what did you mean.

I mean this:

image

1.22 and 1.23 have test-mysql
1.21 has test-mysql5 and test-mysql8

Please adapt the github protected branches config accordingly.

@lunny lunny disabled auto-merge March 31, 2024 13:42
@lunny
Copy link
Member

lunny commented Mar 31, 2024

@lunny v1.21 branch still has mysql5 and mysql8. Can this be changed per-branch?

This PR is unrelated to database charset. It's about git signature's text encoding. So I don't know what did you mean.

I mean this:
image

1.22 and 1.23 have test-mysql 1.21 has test-mysql5 and test-mysql8

Please adapt the github protected branches config accordingly.

All release branches shared the same rules. I think this PR just need a new push to trigger a new CI to resolve the problem.

@silverwind
Copy link
Member

silverwind commented Mar 31, 2024 •
edited
Loading

All release branches shared the same rules

You need to make a separate rule for the 1.21 branch. A push won't solve it. Alternatively just remove these "required checks" that target workflows by name, I don't think they provide anything useful.

@lunny lunny merged commit 2ac78c7 into go-gitea:release/v1.21 Apr 1, 2024
27 checks passed
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@KN4CK3R KN4CK3R KN4CK3R left review comments

@delvh delvh delvh approved these changes

@silverwind silverwind silverwind approved these changes

Assignees

@KN4CK3R KN4CK3R

Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.21.11
Development

Successfully merging this pull request may close these issues.
5 participants
@GiteaBot @silverwind @lunny @KN4CK3R @delvh